====> project: device/synaptics/sequoia
diff --git a/Infra-Red.kl b/Infra-Red.kl
index ae510ef..4eddb5e 100644
--- a/Infra-Red.kl
+++ b/Infra-Red.kl
@@ -91,6 +91,12 @@ key 507   SKB_FUNC_46       # Btv control mode
 key 508   SKB_FUNC_47       # Tv control mode
 key 509   SKB_FUNC_48       # use Tv control mode
 
+key 465   SKB_FUNC_56       # SA02 OTT
+key 466   SKB_FUNC_57       # SA02 Netflix
+key 467   SKB_FUNC_58       # SA02 OCEAN
+key 468   SKB_FUNC_59       # SA02 Apple TV+
+key 469   SKB_FUNC_60       # SA02 Youtube
+
 key 304   SKB_FUNC_13       # Normal Battery
 key 305   SKB_FUNC_14       # Low Battery
 key 306   SKB_FUNC_15       # Empty Battery
@@ -372,6 +378,19 @@ key 668 SKB_FUNC_17     # 0x29c
 key 669 SKB_FUNC_17     # 0x29d
 key 670 SKB_FUNC_17     # 0x29e
 
+## SA02
+## Vendor : 0xF3(remote), Version : 0XF0 ~ 0XF9
+key 741 SKB_FUNC_17     # 0x2e5
+key 742 SKB_FUNC_17     # 0x2e6
+key 743 SKB_FUNC_17     # 0x2e7
+key 744 SKB_FUNC_17     # 0x2e8
+key 745 SKB_FUNC_17     # 0x2e9
+key 746 SKB_FUNC_17     # 0x2ea
+key 747 SKB_FUNC_17     # 0x2eb
+key 748 SKB_FUNC_17     # 0x2ec
+key 749 SKB_FUNC_17     # 0x2ed
+key 750 SKB_FUNC_17     # 0x2ee
+
 ## BT05
 ## Vendor : 0xF4(movon), Version : 0X30 ~ 0X31
 key 672 SKB_FUNC_17     # 0x2a0

====> project: hardware/realtek
diff --git a/bt/rtkbt/rtkbt.mk b/bt/rtkbt/rtkbt.mk
index 79fda16..19a99cc 100755
--- a/bt/rtkbt/rtkbt.mk
+++ b/bt/rtkbt/rtkbt.mk
@@ -33,6 +33,7 @@ PRODUCT_COPY_FILES += \
         $(LOCAL_PATH)/vendor/usr/keylayout/Vendor_005d_Product_0004.kl:vendor/usr/keylayout/Vendor_005d_Product_0004.kl \
         $(LOCAL_PATH)/vendor/usr/keylayout/Vendor_005d_Product_0005.kl:vendor/usr/keylayout/Vendor_005d_Product_0005.kl \
         $(LOCAL_PATH)/vendor/usr/keylayout/Vendor_005d_Product_0006.kl:vendor/usr/keylayout/Vendor_005d_Product_0006.kl \
+        $(LOCAL_PATH)/vendor/usr/keylayout/Vendor_005d_Product_0007.kl:vendor/usr/keylayout/Vendor_005d_Product_0007.kl \
         $(LOCAL_PATH)/vendor/usr/keylayout/Vendor_06e7_Product_8058.kl:vendor/usr/keylayout/Vendor_06e7_Product_8058.kl \
         $(LOCAL_PATH)/vendor/usr/keylayout/Vendor_06e7_Product_8103.kl:vendor/usr/keylayout/Vendor_06e7_Product_8103.kl \
         $(LOCAL_PATH)/vendor/usr/idc/Vendor_06e7_Product_8058.idc:vendor/usr/idc/Vendor_06e7_Product_8058.idc \
@@ -41,7 +42,8 @@ PRODUCT_COPY_FILES += \
         $(LOCAL_PATH)/vendor/usr/idc/Vendor_005d_Product_0003.idc:vendor/usr/idc/Vendor_005d_Product_0003.idc \
         $(LOCAL_PATH)/vendor/usr/idc/Vendor_005d_Product_0004.idc:vendor/usr/idc/Vendor_005d_Product_0004.idc \
         $(LOCAL_PATH)/vendor/usr/idc/Vendor_005d_Product_0005.idc:vendor/usr/idc/Vendor_005d_Product_0005.idc \
-        $(LOCAL_PATH)/vendor/usr/idc/Vendor_005d_Product_0006.idc:vendor/usr/idc/Vendor_005d_Product_0006.idc
+        $(LOCAL_PATH)/vendor/usr/idc/Vendor_005d_Product_0006.idc:vendor/usr/idc/Vendor_005d_Product_0006.idc \
+        $(LOCAL_PATH)/vendor/usr/idc/Vendor_005d_Product_0007.idc:vendor/usr/idc/Vendor_005d_Product_0007.idc
 endif
 
 # base bluetooth

====> project: syna-release/boot
diff --git a/bootloader/sm_rom/core/include/sm_ir_key_def.h b/bootloader/sm_rom/core/include/sm_ir_key_def.h
index ec93c93..218b5fa 100644
--- a/bootloader/sm_rom/core/include/sm_ir_key_def.h
+++ b/bootloader/sm_rom/core/include/sm_ir_key_def.h
@@ -145,6 +145,11 @@ typedef enum {
 	MV_IR_KEY_VIZIO,
 	MV_IR_KEY_SA01_BAT_CHARGING,
 	MV_IR_KEY_SA01_BAT_FULL,
+	MV_IR_KEY_SA02_OTT,
+	MV_IR_KEY_SA02_NETFLIX,
+	MV_IR_KEY_SA02_OCEAN,
+	MV_IR_KEY_SA02_APPLETV,
+	MV_IR_KEY_SA02_YOUTUBE,
 	MV_IR_KEY_KID_BAT_CHARGING,
 	MV_IR_KEY_KID_BAT_FULL,
 	MV_IR_KEY_CLOSEDCAPTION,
@@ -628,6 +633,17 @@ typedef enum {
 	MV_IR_KEY_CUSTOM739,
 	MV_IR_KEY_CUSTOM740,
 
+	MV_IR_KEY_CUSTOM741,
+	MV_IR_KEY_CUSTOM742,
+	MV_IR_KEY_CUSTOM743,
+	MV_IR_KEY_CUSTOM744,
+	MV_IR_KEY_CUSTOM745,
+	MV_IR_KEY_CUSTOM746,
+	MV_IR_KEY_CUSTOM747,
+	MV_IR_KEY_CUSTOM748,
+	MV_IR_KEY_CUSTOM749,
+	MV_IR_KEY_CUSTOM750,
+
 	MV_IR_KEY_CUSTOM752,
 	MV_IR_KEY_CUSTOM753,
 	MV_IR_KEY_CUSTOM754,
diff --git a/bootloader/sm_rom/customization/bg5ct_ffv/include/sm_ir_key_table.h b/bootloader/sm_rom/customization/bg5ct_ffv/include/sm_ir_key_table.h
index 454c835..ec04ffe 100644
--- a/bootloader/sm_rom/customization/bg5ct_ffv/include/sm_ir_key_table.h
+++ b/bootloader/sm_rom/customization/bg5ct_ffv/include/sm_ir_key_table.h
@@ -200,6 +200,12 @@ static ir_key_table_t vendor_ir_nec_table[] = {
 	{0x916e, MV_IR_KEY_SA01_BAT_CHARGING},   /* Battery is charging */
 	{0x906f, MV_IR_KEY_SA01_BAT_FULL},       /* Battery is full */
 
+	{0x9669, MV_IR_KEY_SA02_OTT},           /* SA02 KEY_OTT */
+	{0x956a, MV_IR_KEY_SA02_NETFLIX},       /* SA02 KEY_NETFLIX */
+	{0x946b, MV_IR_KEY_SA02_OCEAN},         /* SA02 KEY_OCEAN */
+	{0x8a75, MV_IR_KEY_SA02_APPLETV},       /* SA02 KEY_APPLETV */
+	{0x936c, MV_IR_KEY_SA02_YOUTUBE},       /* SA02 KEY_YOUTUBE */
+
 	{0x9966, MV_IR_KEY_BTV_CONTROL_MODE},
 	{0x9867, MV_IR_KEY_TV_CONTROL_MODE},
 	{0x9768, MV_IR_KEY_USE_TV_CONTROL_MODE},
@@ -404,6 +410,17 @@ static ir_key_table_t vendor_ir_nec_table[] = {
 	{0xe8f3, MV_IR_KEY_CUSTOM669},
 	{0xe9f3, MV_IR_KEY_CUSTOM670},
 
+	{0xf0f3, MV_IR_KEY_CUSTOM741},  /*  0xF3(remote), SA02, Version : 0xF0 ~ 0xF9, Total : 10 */
+	{0xf1f3, MV_IR_KEY_CUSTOM742},
+	{0xf2f3, MV_IR_KEY_CUSTOM743},
+	{0xf3f3, MV_IR_KEY_CUSTOM744},
+	{0xf4f3, MV_IR_KEY_CUSTOM745},
+	{0xf5f3, MV_IR_KEY_CUSTOM746},
+	{0xf6f3, MV_IR_KEY_CUSTOM747},
+	{0xf7f3, MV_IR_KEY_CUSTOM748},
+	{0xf8f3, MV_IR_KEY_CUSTOM749},
+	{0xf9f3, MV_IR_KEY_CUSTOM750},
+
 	{0x30f4, MV_IR_KEY_CUSTOM672},  /*  0xF4(movon), BT05, Version : 0x30 ~ 0x31, Total : 2 */
 	{0x31f4, MV_IR_KEY_CUSTOM673},
 

====> project: syna-release/linux_4_9_q
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 22a5b0f0..9c35248f 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2131,6 +2131,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
 	{ HID_BLUETOOTH_DEVICE(0x005d, 0x0004) },//BMM_BA03, BRM_BA03
 	{ HID_BLUETOOTH_DEVICE(0x005d, 0x0005) },//BRM_SA01
 	{ HID_BLUETOOTH_DEVICE(0x005d, 0x0006) },//BOS_KR01
+	{ HID_BLUETOOTH_DEVICE(0x005d, 0x0007) },//BRM_SA02
 	{ HID_BLUETOOTH_DEVICE(0x06E7, 0x8058) },//VaS kerwin: BUE_BT07, BUE_BT09
 	{ }
 };
diff --git a/drivers/input/keyboard/berlin-ir.c b/drivers/input/keyboard/berlin-ir.c
index 6e4c5fa1..4d2a394d 100644
--- a/drivers/input/keyboard/berlin-ir.c
+++ b/drivers/input/keyboard/berlin-ir.c
@@ -124,6 +124,11 @@ typedef enum {
 	MV_IR_KEY_VIZIO,
 	MV_IR_KEY_SA01_BAT_CHARGING,
 	MV_IR_KEY_SA01_BAT_FULL,
+	MV_IR_KEY_SA02_OTT,
+	MV_IR_KEY_SA02_NETFLIX,
+	MV_IR_KEY_SA02_OCEAN,
+	MV_IR_KEY_SA02_APPLETV,
+	MV_IR_KEY_SA02_YOUTUBE,
 	MV_IR_KEY_KID_BAT_CHARGING,
 	MV_IR_KEY_KID_BAT_FULL,
 	MV_IR_KEY_CLOSEDCAPTION,
@@ -616,6 +621,17 @@ typedef enum {
 	MV_IR_KEY_CUSTOM739,
 	MV_IR_KEY_CUSTOM740,
 
+	MV_IR_KEY_CUSTOM741,
+	MV_IR_KEY_CUSTOM742,
+	MV_IR_KEY_CUSTOM743,
+	MV_IR_KEY_CUSTOM744,
+	MV_IR_KEY_CUSTOM745,
+	MV_IR_KEY_CUSTOM746,
+	MV_IR_KEY_CUSTOM747,
+	MV_IR_KEY_CUSTOM748,
+	MV_IR_KEY_CUSTOM749,
+	MV_IR_KEY_CUSTOM750,
+
 	MV_IR_KEY_CUSTOM752,
 	MV_IR_KEY_CUSTOM753,
 	MV_IR_KEY_CUSTOM754,
@@ -823,6 +839,11 @@ static struct ir_keymap keymap_tab[] = {
 
 	MAKE_IR_KEYMAP(MV_IR_KEY_SA01_BAT_CHARGING, 0, 500),
 	MAKE_IR_KEYMAP(MV_IR_KEY_SA01_BAT_FULL, 0, 501),
+	MAKE_IR_KEYMAP(MV_IR_KEY_SA02_OTT, 0, 465),
+	MAKE_IR_KEYMAP(MV_IR_KEY_SA02_NETFLIX, 0, 466),
+	MAKE_IR_KEYMAP(MV_IR_KEY_SA02_OCEAN, 0, 467),
+	MAKE_IR_KEYMAP(MV_IR_KEY_SA02_APPLETV, 0, 468),
+	MAKE_IR_KEYMAP(MV_IR_KEY_SA02_YOUTUBE, 0, 469),
 	MAKE_IR_KEYMAP(MV_IR_KEY_KID_BAT_CHARGING, 0, 502),
 	MAKE_IR_KEYMAP(MV_IR_KEY_KID_BAT_FULL, 0, 503),
 
@@ -1066,6 +1087,17 @@ static struct ir_keymap keymap_tab[] = {
 	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM668,	0,668),
 	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM669,	0,669),
 	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM670,	0,670),
+	/* rcu info, Remote Soultion, SA02 */
+	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM741,	0,741),
+	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM742,	0,742),
+	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM743,	0,743),
+	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM744,	0,744),
+	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM745,	0,745),
+	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM746,	0,746),
+	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM747,	0,747),
+	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM748,	0,748),
+	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM749,	0,749),
+	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM750,	0,750),
 	/* rcu info, Movon, BT05 */
 	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM672,	0,672),
 	MAKE_IR_KEYMAP(MV_IR_KEY_CUSTOM673,	0,673),

====> project: system/bt
diff --git a/swan_libs/lib/libswan_bt.a b/swan_libs/lib/libswan_bt.a
index b3ff71163..3c6bd11e2 100644
Binary files a/swan_libs/lib/libswan_bt.a and b/swan_libs/lib/libswan_bt.a differ

====> project: vendor/foxconn
diff --git a/prebuilts/modules/hid-skbrm.ko b/prebuilts/modules/hid-skbrm.ko
index b7c3302..642b3dc 100644
Binary files a/prebuilts/modules/hid-skbrm.ko and b/prebuilts/modules/hid-skbrm.ko differ

====> project: frameworks/base
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 1469c715815..bb685873e7b 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -4287,8 +4287,19 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 || event.isWakeKey();
 
         //VaS, ignore event.isWakeKey() defined in KeyEvent.java
-        if("true".equals(SystemProperties.get("sys.passive.standby")))
+        if("true".equals(SystemProperties.get("sys.passive.standby"))) {
             isWakeKey = (policyFlags & WindowManagerPolicy.FLAG_WAKE) != 0;
+            if(isWakeKey) {
+                if("true".equals(SystemProperties.get("sys.stb.passive.enter"))) {
+                    if(keyCode == KeyEvent.KEYCODE_POWER)
+                        SystemProperties.set("sys.stb.passive.on.reason", "power_key");
+                    else if (keyCode == KeyEvent.KEYCODE_SKB_FUNC_57)
+                        SystemProperties.set("sys.stb.passive.on.reason", "netflix_key");
+                    else if (keyCode == KeyEvent.KEYCODE_SKB_FUNC_58)
+                        SystemProperties.set("sys.stb.passive.on.reason", "bplay_key");
+                }
+            }
+	}
 
         if (interactive || (isInjected && !isWakeKey)) {
             // When the device is interactive or the key is injected pass the

====> project: frameworks/native
diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp
index 60d2526c7..56346303a 100644
--- a/services/inputflinger/InputReader.cpp
+++ b/services/inputflinger/InputReader.cpp
@@ -2429,7 +2429,7 @@ void KeyboardInputMapper::processKey(nsecs_t when, bool down, int32_t scanCode,
     // each wake key individually.
     // TODO: Use the input device configuration to control this behavior more finely.
     if (down && getDevice()->isExternal() && !isMediaKey(keyCode)) {
-        if (keyCode == 26) //VaS, power wake only
+        if ((keyCode == AKEYCODE_POWER) || (keyCode == AKEYCODE_SKB_FUNC_57) || (keyCode == AKEYCODE_SKB_FUNC_58) ) //VaS, Power Key or Netflix key or bplay_key ;
         policyFlags |= POLICY_FLAG_WAKE;
     }
 

====> project: syna-release/boot
diff --git a/bootloader/sm_rom/core/source/sm_ir.c b/bootloader/sm_rom/core/source/sm_ir.c
index bb846a1..aba1be4 100644
--- a/bootloader/sm_rom/core/source/sm_ir.c
+++ b/bootloader/sm_rom/core/source/sm_ir.c
@@ -582,7 +582,9 @@ hresult mv_sm_process_key(unsigned int module_id, unsigned int key)
 			/*FIXME*/
 
 			//VaS Jim, wake up only from power key, 0x8000200
-			if ( (key & 0xFFFF) != MV_IR_KEY_POWER ) {
+			if ( ((key & 0xFFFF) != MV_IR_KEY_POWER) &&
+			     ((key & 0xFFFF) != MV_IR_KEY_SA02_NETFLIX) &&
+			     ((key & 0xFFFF) != MV_IR_KEY_SA02_OCEAN)) {
 				//PRT_INFO("----- 0x%8x key hit in suspend state, ignore\n", key);
 				break;
 			}